From bff413465b3bd478345a256848c58deb7bb0df9a Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Fri, 20 Sep 2013 16:32:03 -0500 Subject: [PATCH] Set CFLAGS, CPPFLAGS, and LDFLAGS solely via configure in debian/rules. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Don't override the CFLAGS, CPPFLAGS, and LDFLAGS values chosen by the upstream configure script; instead, make any adjustments at configure time. Our quashing of "-Wl,-znocombreloc" during the make invocation was causing i386 builds of emacs24-lucid to fail under X. Thanks to Łukasz Pankowski for the report, and Samuel Bronson for the patch. Closes: 684788 --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index fdd71fd174b..c8e88e9dca5 100755 --- a/debian/rules +++ b/debian/rules @@ -342,13 +342,13 @@ define cfg_tree rm -rf $(1) mkdir $(1) cp -a $$(ls -A | egrep -v '^(\.git|\.pc|debian)$$') "$(1)" - cd $(1) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" ./configure $(confflags) $(2) + cd $(1) && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure $(confflags) $(2) endef define build_cmd - $(MAKE) -C $(1) -j $(joblimit) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" + $(MAKE) -C $(1) -j $(joblimit) # If we don't use bootstrap, we need to explicitly build info. - $(MAKE) -C $(1) -j $(joblimit) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" info + $(MAKE) -C $(1) -j $(joblimit) info # Make sure we chose liblockfile. ldd $(1)/lib-src/movemail | grep liblockfile endef -- 2.30.2